change to fix autostart