kind of fixed comments