Fixes for Issue #14