Fix next level logic