fixed comment functionality