This is not the most elegant and completly perfect, but it will do for
now...
Close #5986
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>