Looks like some code got accidentally rearranged. Fixing