Better fix for extrude