Issue 325: done