Fixing Issue_692