Fixing generation and output