- fixed issue #13