Changes for comment crashed