Bugfix on empty lists