Fixing Bug: 59826

Change-Id: I1313cabb9d97ff7af427a14bebd3517a3526af0a