Fixing next() breaks