Fixed bad comparator and initialized forced variable

Change-Id: Ib43c9af180d2cafe7e15d525aede2403ae148793