fixed issues for beta4.