Fixing Issue_527