Fixing issue no. 1159 in bugzilla (mlnx: 3111)