fixed issues for beta3.