Workaround fix for issue #9880