Updated issue #373