Fix for Issue #137

Dharmatej