Closes #1403