Removed old FIXME, probably not needed anymore