hopefully fix piston bug