Backport list fix