Resolve ubuntu (6/19)

Resolve ubuntu