Fix Issue #212 and pass test suite.