- fixed issue #30