This is just a partial fix.
Fixes #6148
(cherry picked from commit 114a88bc)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>