Added simple fix for OE-2752