Fixing "Y" behavior