Fix for 3.x