Follow up to repalce listener approach with a global navigator object with a flag to check - RA-190