Events properly ordered.
Merge pull request #949 from ngodfraind/master

Events properly ordered.