Fixing "Optimization" from commit
603c9593045f50820ca7830d99e715f25849f18a