Fix NPE on enable