Fixing some issue