Fixing Issue_857