Fix LP: #1168834