Closes #1496