Resolve ubuntu (15/19)

Resolve ubuntu