2325: Fixed  reliance on moderated_by