simplify status propagation. it seems to be more correct this way, too