Fix piston retraction