Fix for double event firing