Fix issue #25