Fixed ICollection support