re-fixing a bug that got reintroduced because of a cloned instance or something i have no idea