We do still need autostart