fix ordering bug as my previous variable ordering ocd got a bit aggressive