Fix Ubuntu bug with cyclical dependcies