Locals completion: a fix and an extension