Fixd logic behind run check