Closes #1218