Orbit removal bugfix.