Fix lp#586105 a little better but far from well.