User comments fix