Temporary Fix for SxOrbwalk