Orb fix

This is tested and will go in as hot fix.