Modify for FLIM 1.6.