Fix state for Enable / Disable