Fixes for Issue #146