Choice fix