fixing for beta6