Removing FIXME comment