Fixed for 6.0