FML Patch - Temporary solution