Attempt to fix failing build on 3.2