small enhance
fix large dataset issue