Fix

- Changed order of some code.