Closes #1553