Fix issue #464