Fix Ubuntu 14.04 issue as advised