add option to disable auto detect