fixed for beta4