fix for MAC uniqueness error (more)