closes #1383