Attempted fix of _next