Wrappers and bug fix