Fix keyval decode function