Fixed findEvents