Fix Pie 2.0 merge