Fix issue #165