For 2.0
Fixed bug in Comment at right