OO-1353: replace deprecated method