Optimization fix