Small fix for non-autostarting