Closes #1228