Fix replace in return value decoding.