...and a fix for a encode/decode issue