Short list fix