Removed already solved FIXME