More optimization

Change-Id: I00721c883359f505d3e4d3694315b33fde7de1cc
Signed-off-by: Eyal Salomon <esalomon@mellanox.com>