Closes #1354