Closes #1176