Fixes for Issue #162