fix 3.2, 4.0, 4.1