Another possible fix

Change-Id: I81095beb69c0996d819158e3cadc451a83653d2f