working on issue 381