Fixes for Issue #25