Decode seems to work ok now except for one special case