Closes #1432