Fixed issue with multiple events fired on Windows