Removed FIXME comment [ci skip]