Issue #1 fix

Signed-off-by: Régis Caspar <regis.caspar@gmail.com>