cleanup / fix for ubuntu