Trying to fix 3.2 support