Fix wonrg extend