Final optimized fix