Tentative for #156

Signed-off-by: Gaetan SEMET <gaetan@xeberon.net>
Temp fix for #170

Signed-off-by: Gaetan SEMET <gaetan@xeberon.net>