final updates for issue #618