Issue 341

7