Fix notice when migrating from 3.6 to 3.8