Fix overflow when decoding data

[josepchetrit12]

In some cases when we decode the data, the data overflows we need to fix that. Example