Fix regression when building packages...