Fix for issue 154
- events can no longer be resolved multiple times