closes #377