fix for 1.5.x+