closes #1289