Fixed comment shuffle.