Comments Fix