Fixed introduced bug on List