Bug fix to allow auto startup