Fixing hasWords