Closes #1561