bugfix disabled mode