Fix full annotation bug described in NCF-275