Workaround for crash reported in bug #18096