Partial implemenation of correct rerun behaviour