Fix for Issue #37, with a Unit Test.