Initial work on #315

Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>
Fix #315

Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>