issue #14 fix