Fix #280
Merge pull request #281 from ZeusWPI/fix/280/scan-search-event-registrations

Fix #280