fix yankstack and Y mappging