Fixing statistical tools...