change in enforcement to avoid hanging for no reason