Fix issue #654