working on double event firing seems to have fixed it