Closes #1593