[Algorithm] Events not suiting bug fix