getting things back stable for beta 5