Fixed the disappearing events issue