Fix batch annotation bug