Reverted the change involving detecting full words. ( Too buggy. )