Fix issue #179