VIVO-653: implemented suggested fix