fixing https://github.com/systemd/systemd/issues/19689 (cherry picked from commit 682e043c) (cherry picked from commit 2683e7a1) (cherry picked from commit 8e00d92f)