Fix problem with autostart