removed FIXME comment previously fixed
removed FIXME comment previously fixed