Fixed issue #640.