vowing to ‘fix’ Nation-State Law