Removed already fixed FIXME