Fix piston-workspace