Resolves PR 32436 from Igor Sobrado based on a suggestion by Dieter Roelants, except I expanded the message further.