OO-1206: i only make a defensive fix until I can reproduce the issue