patched grammar again