fixing some issue