Fixed issue 71; but discovered similar issues to it for other events.