Workaround for issue 6870