Fix the broken first run without downgrading the default