Optimization fix.