Partial fix for -rerun