2.0.beta bug fix