Fix issue with Hazelcast deadlocking