Fix issue #156