fixed issue #13