Fixed single and empty collection calls