Add issue 355