addressed chained-waiton issues as well as rollup to deleted issue