closes #1436