Fixing comments #35