bugfix: NPE on disable