Add issue 348