attempt to fix some odd behaviors in some distributions