fixing some bug

The