closes #73 (again)