change logic

Change-Id: I8b7a9e1a4c0e41f55ed1259a15e17766b52b4361