Fixed for 3.5