Fixing some thing