- Fix issue #2