workaround for #1472