Add issue 354