Closes #1401