Fix issue #373