Fix Logical Error

Change-Id: Ie103a8b45ec2489cdbd1a01e991646216258aace