- Fix issue #319