Infinty bug Fix 2