Orbwalker fix