Fixed annotation loading