Fixed disable method

Fixed the disabling method.

Note: Might require some refactoring.