Fix issue #146