Fix Issue #30
Fix Issue #30