comment fix (cherry picked from commit b1e41fa)