Issue 338: done