fixed order commenting bug