Closes #1474