Fixes for Issue #18