remove disable_with if not needed
Merge pull request #362 from niphlod/enhancement/disable_with

remove disable_with if not needed