Better list fix