Merge pull request #2784 from saree90:bugfix_Simplex