Fixed conversion of collections