Fixed for 6.1.x