Fix ordering of code.