Fixes for Issue #30