Another lunch fix

Change-Id: I1646b6d512ec1a5a439f842eb18c4e5233d08091