JS-1115: fixed