moved list fix to separate file