removed FIXME comment