Closes #1427