Resolve ubuntu (18/19)

Resolve ubuntu