#10262: Improve answers