fixed issue #30