Added support for improper distributions.