closes #1592, closes #1634