Fix next() in Player