decoder/encoder fix

Change-Id: I3c2cd7bcf87c240eeae63d6bff354bec5198c2b8