Fix long boot time 1/5