working on issue 526