Add workaround for #1480.