fixing the wrapper