Fix issue #214

Second part of fix to prevent multiple copies of event firing