bug fix, and beta1