Fixes for Issue #31