Final fixed for 0.3b1.