re #818 - Changed ordering