BUGFIX: Handling empty collections