addresses bd461477bd close #1244, close #1580 --------- Co-authored-by: Anbraten <anton@ju60.de>
bd461477bd