manual stuff for beta1 hot fix