fix and support comment