Fix ordering. Closes #2229.