Closes #1419