Resolve ubuntu (17/19)

Resolve ubuntu