Closes #1522