Work on #658
Regen nagaqueen with latest fix