fixxed for ff