case event loader logic fix