Closes #1392.