Fixed decode bug