Wrapper class fix