Remove the FIXME, something else is going on