Temporary solution with decoding