Regen fix, and right click refix