Kestrell fix on Ubuntu