Fix annotation bug