Reduce time from 30s to 15s by avoiding double call of decode-message.