FIX: generation of doc tags