Actually fix the wrapper
Fix ordering and `data`