fix previous fix

Change-Id: I0ceaf6367163bbe8aa0f0774961f2e2398471aef