Main fix is here.