Closes #1449