really fix orphaned pointers(?)