Improved fix instead of patch #9699. Signed-off-by: Simon Goldschmidt <goldsimon@gmx.de> (cherry picked from commit 98d1cb1c000577468e2b1b54137b4bb37f161f85)