Fix important bug regarding pistons