Fixed issues when using an enum that is not called State