Fix #388 and fix #390

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