Fix for Excel generation