beta 2 bug fix