Fixed for beta1 release