issue #156 fix