Better fix for doc generation