Fixed for 3.8