Removed buggy event sorting