Removed FIXME comment for a fixed issue