Closes #1491