Fix #697

Nothing controversial I think, but let's think it over a little...