#152 fixed issue with repeating events due to incorrect inclusion.