fixed issue #156