Fixing "Y" behavior

Fixes #28