Fix to last fix. Need to condense last several commits.