tuning
fix bug