beta 1.0 bug fix