Closes #1501