closes #431