Closes #1362