Adding a fix for first LS with no events