Solution is ok, but takes longer to perform. Signed-off-by: Julien Lengrand-Lambert <julien@lengrand.fr>