Issue #95 Fix

Check Issue #95