Fix issue #25

Fix issue #25