issue 645 update