Closes #1565