fixed issue #14