Fix OR optimization

Fix parameters transfer system for OR optimization