fixed the wrapper problem