Hopefully fixing for 3.2