Workaround issue 11178