Ooooupss… making environment shortcuts work again