fixed issue #24