Fixed for 0.8