fixing pending comments