closes #405