Non current events param fix