fix handle decode