Complex events fixed