closes #432