Issue 318, 319: bug handled.