LF2 compatibility fix