Fix Next wrapper