manually forward porting #68 to indigo