Fixed the wrapper