Fix word overlap bug