Must fix immediate event call