Fixed bug on disable