Don't try to decode if it's really necessary, first tentative for #600