Try to fix some rest call order