fix system lockups

This small commit seems to be what was behind all the big lockup problems.