Hotfix for new ff2_1st_set code