fix order of notifications