Fix for piston extension, needs testing.