XXX fix for linux build