Issue #1477 potential workaround.