Final fix for 3.x