Workaround for #1472 crashes