fix for ORION-360