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

Change-Id: I7c0cf7134faec534a8bea35aec30c46efc0f2eef