fix ind vs other, closes #524
fix merge