Yet another fix

Change-Id: Ic91a0af4f1ce42160fecdbdbd8cdfba77446a4f8