Fixed ordering issue