Resolved issue with wrong comparison

* This path needs to be backported to 0.2.x

Fixes: bug #1213074

Change-Id: I98af56809f0ab84c01aa800d7f834c8131657c5f
Merge "Resolved issue with wrong comparison"