Fixed eventHandler case unlock