Fix single word bug, take 2