Commentary View Fix