issue #14 : fixed