Event Security Bug Fix