Clean distribution: Temporary fix