Fix pie

Fixes structure breaking issues