Closes #1416