WON-8929: fixed