Fixed decode issues