Fix nasty error on disable