Fixed ordering notifications