fix user wrappers