Fix LP: #1173977