Updated to work with ubuntu 1204