Fixed for 0.6