Fix annotation loading