Fixes #1524: Change to proper order