Featuring bugfix
Bugfix on empty collections