bug with static events fixed