closes #1160