Bug fix
Next() is working