More accurate fix