Should patch piston dupe bug #2