Credit @phaer for OE1 (#2646)