Added tests for Issue #137
Added fix for Issue #137