Fix ordering of items