working on issues 434 and 435