Fixed for beta 2