working on issue 366