Closes #1280