One last fixup

Due to a recent PR this got broken.
Updated to master again, fixed up the calls to Orbit class.

Once this is merged I will merge it into master.