put support for regular mems back into resolve hazards