Fix lp 1168836