Wrote test for Issue #65
Fix Issue #65