Fix for FFv3.x