Fix annotation patch order, caused great breakage