Closes issue #1148 by fixing problems introduced in PR #1140. Co-authored-by: Werner Henze <w.henze@avm.de>