addresses #340