Fixed bugs with 0.9+