fixed errors for beta 4