Fixing Issue_656