beta 1.0 critical bug fix 2