fixed issue with event