Fix issue #164