Closes #1476