fixed all FIXME