Fix issue #169