Fixed for 0.10.0