Fixed autostart