Remove fixme I don't have control about