Improve 3.2 even more