closes #1316