Resolve ubuntu (16/19)

Resolve ubuntu