Fixed some weird bug with comments