Reorder things, in hope to fix error with active counts