Corrected bug

Missed implementing flags

Change-Id: Id51532679a343345335fdd05689e023a65a60cd6