closes #1366