Work around whoopsie with 3.3.2