issue #461