Really fix LP 1168836