Fixed for 0.9