Fixed next unit evaluation