Fixing commentaries