Fixing a FIXME