Fixing Issue_605