Fix for 3.2