closes #1090