Closes #1193