Fixed problem with event ordering that fixes #456.