Resolve ubuntu (8/19)

Resolve ubuntu