Fixed for beta6