Fixed -m, added conditional waiver propagation