Fix zipper implementation