[FIX] Added changes for the issue mentioned in opw ref 610515 which is in the same function