working on issue 415