Fixing Issue_517