Closes #1304