fix wrapper null persing