#297 enable/disable fixed