so many changes
fixes bug from recent SN update