Fix a bug in how EMF's were computed, still bug at upper theta bound