Fix for NMA misbehavior