Fixes Bug 58450

Change-Id: I6fa1295f7845779527e990c24150ba8dec15f801