Fix on dev branch for Linux Build