Fixed issue #465