Closes #1428