Merge pull request #405 from bhariharan/unstable

Fix for RuntimeException in test suite.
Latest shared commit