PER-107: fixed issues after merge