Closes #1372