Fixed issue with event in case the list is not correct