Fixed empty collection bug as per #15