Fixed next function
conflicts