closes #1590, closes #1589