Issue #11 : fix