Comment bug fixed