fix for 2.3.x and 2.4