Possibly final fix for os-detecting