Fix for Issue #16