Fixed comments functionality