Closes #1750