Fixed decode issue