PER-107: fixed issue after merge