Fix #597 (closed), along with one issue reported to the mailing list on 2020-08-17 by Rolf Sander.
This will create a new commit in order to revert the existing changes.
