working on issue 416