Test for Issue #31
Fix for Issue #31