fixes an issue with ff, need to review that