Fix lp: #1168863