- Fix issue #305