Fixed event call bug