working on issue 745