Closes #1623