fixed issue #15