• fixed issue with event consuming