Sriram: Fixing Issue #107