Fix mate resolution