Fix for empty collection