Fixes #1880 Signed-off-by: Marc Khouzam <marc.khouzam@gmail.com> Co-authored-by: Deleplace <deleplace2015@gmail.com>