correctly handle different runs