Bug fix for comment forms