fix disable() behaviour