Bugfix for lists