Closes #1058