APP-2782 Bard oome fix

reopening PR 387, closed that by mistake