Add issue 339