Moved FIXME to relevant place.