closes #340 (again)