issue #640

issue #640