issue #640