Fixes for Issue #27