Removed already fixed fixme