fixing some problem