Optimized the fix somewhat