Closes #1415