decoder: Fix in detecting dangling fields am: 6dd54b9e18 am: 7e44189621 am: 9157866b2b

Change-Id: I3b62e821e1133034944e9a6747b3943fe997338e