OES bug fix - Manli