closes #434