Bug Fix: moved event setter to eliminate repeat events