closes #1016