Fix #223, Fix ordering issues with collections