Fix issue where events incorrectly appear as in use