fix for beta6