Fix for double events firing