fix stuff for ff again