correct encoded raw storage