Closes #1549