closes #1115