Closes #1468