Fix for Jeet Issue #30
Fix for Jeet Issue #30