Fix for failing builds when path contained a space