Next dev fix