Removed FIXME comment