closes #1404