Code optimization fix.