Partial fix to Issue #205