Fixed enable state mixups