Fixes for Issue #164