Fixing shift/reduce. Fixes #4