proposed workaround for #4629