Fix issue #26