Fix decode after refactor