Partial fix to Issue #352