#1 fixes in fx