closes #1263