Issue #13

Fix issue #13.