issue #618