Fixed issue #461