Fixed issue #630