Issue #386 - Via Tender: Auto Registration Error in line 337