Fix call order to be the same as definition order