Fix commentary mapping