[wallace] more flapping scneario fixes