Fixes bug with current in send_event()