Simplify first run check