Add a workaround for #1799