Merge in fix for Ubuntu