Fixed issue #629