Fixed optimized local variables