Fix for Issue #76

With unit test for the future