Sorry for last commit which was a little retarded
(cherry picked from commit 865a279f05af298d19e23aa75fafd012b0106e6f)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>