Removed a FIXME, solved earlier