removed fixme comment