closes #1298 closes #1261