fix annotation bugs