Add a small robustification wrt #54