Moderation tools fix

As promised, fix for moderaton tools