Fix pivots problem