Fixed for 1.4.x