over/out/disable states fix