Closes #1259