RA-395: fixing scope